From 3671b2bbe9f06733fa39d138a31ac85e187bc6b2 Mon Sep 17 00:00:00 2001 From: =?utf8?q?Lo=C3=AFc=20Minier?= Date: Mon, 15 Oct 2007 13:26:34 +0000 Subject: [PATCH] Fix "cannot open display" error message when display is set by the DISPLAY MIME-Version: 1.0 Content-Type: text/plain; charset=utf8 Content-Transfer-Encoding: 8bit 2007-10-15 Loïc Minier * gtk/gtkmain.c: (gtk_init): Fix "cannot open display" error message when display is set by the DISPLAY env var. (#486636, Mike Hommey) svn path=/trunk/; revision=18909 --- ChangeLog | 5 +++++ gtk/gtkmain.c | 4 +++- 2 files changed, 8 insertions(+), 1 deletion(-) diff --git a/ChangeLog b/ChangeLog index 662af03a2d..757bb28313 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,8 @@ +2007-10-15 Loïc Minier + + * gtk/gtkmain.c: (gtk_init): Fix "cannot open display" error message + when display is set by the DISPLAY env var. (#486636, Mike Hommey) + 2007-10-13 Johan Dahlin * gtk/gtk-builder-convert diff --git a/gtk/gtkmain.c b/gtk/gtkmain.c index 910d93fb2a..47d615546c 100644 --- a/gtk/gtkmain.c +++ b/gtk/gtkmain.c @@ -933,7 +933,9 @@ gtk_init (int *argc, char ***argv) if (!gtk_init_check (argc, argv)) { const char *display_name_arg = gdk_get_display_arg_name (); - g_warning ("cannot open display: %s", display_name_arg ? display_name_arg : " "); + if (display_name_arg == NULL) + display_name_arg = getenv("DISPLAY"); + g_warning ("cannot open display: %s", display_name_arg ? display_name_arg : ""); exit (1); } } -- 2.30.2